# # # add_file "src/view/ToolBox.cpp" # content [1499c791ea6838e8dc4bb337e7f9e52160e714f3] # # add_file "src/view/ToolBox.h" # content [a36cc4d7971ca965460150b651c3356e4f17b92c] # # patch "res/forms/db_variables.ui" # from [690d763ebe661aace3e5d70e2b80555a1ec151f9] # to [04eb788b7631df34fa9fa2566d846540eb93c264] # # patch "res/forms/icon_help.ui" # from [bb6e1aadff8a672675c787f35623da6fd76653b4] # to [6093aff5d4e6b6a2c895a307b2792eaafaafaa5a] # # patch "res/forms/nodeinfo.ui" # from [e4c6043616ed5f5f0406523d128a4c43517bbb05] # to [32e81bb113549633a5db7f31190fd98fd027e7e2] # ============================================================ --- src/view/ToolBox.cpp 1499c791ea6838e8dc4bb337e7f9e52160e714f3 +++ src/view/ToolBox.cpp 1499c791ea6838e8dc4bb337e7f9e52160e714f3 @@ -0,0 +1,81 @@ +/*************************************************************************** + * Copyright (C) 2009 by Thomas Keller * + * address@hidden * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "ToolBox.h" +#include "vocab.h" + +ToolBox::ToolBox(QWidget * parent) : QToolBox(parent) +{ + connect( + this, SIGNAL(currentChanged(int)), + this, SLOT(currentIndexChanged(int)) + ); + + currentIndexChanged(currentIndex()); +} + +ToolBox::~ToolBox() {} + +void ToolBox::setItemText(int index, const QString & text) +{ + QString txt(text); + if (txt.indexOf(QChar(9656)) != 0 && + txt.indexOf(QChar(9662)) != 0) + { + txt.prepend(" ").prepend(QChar(9656)); + } + QToolBox::setItemText(index, txt); +} + +void ToolBox::itemInserted(int index) +{ + setItemText(index, itemText(index)); +} + +void ToolBox::setCurrentIndex(int index) +{ + QToolBox::setCurrentIndex(index); + currentIndexChanged(index); +} + +void ToolBox::currentIndexChanged(int idx) +{ + for (int i=0; i arrow is present + if (text.indexOf(QChar(9656)) == 0) + continue; + + // the v arrow is present + if (text.indexOf(QChar(9662)) == 0) + { + text = text.mid(1); + } + + text.prepend(QChar(9656)); + QToolBox::setItemText(i, text); + } + + QString text = itemText(idx); + text = text.mid(1); + text.prepend(QChar(9662)); + QToolBox::setItemText(idx, text); +} + ============================================================ --- src/view/ToolBox.h a36cc4d7971ca965460150b651c3356e4f17b92c +++ src/view/ToolBox.h a36cc4d7971ca965460150b651c3356e4f17b92c @@ -0,0 +1,44 @@ +/*************************************************************************** + * Copyright (C) 2009 by Thomas Keller * + * address@hidden * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation, either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef TOOLBOX_H +#define TOOLBOX_H + +#include + +class ToolBox : public QToolBox +{ + Q_OBJECT + +public: + ToolBox(QWidget *); + ~ToolBox(); + + void setItemText(int index, const QString & text); + +public slots: + void setCurrentIndex(int index); + +protected: + void itemInserted(int index); + +protected slots: + void currentIndexChanged(int); +}; + +#endif ============================================================ --- res/forms/db_variables.ui 690d763ebe661aace3e5d70e2b80555a1ec151f9 +++ res/forms/db_variables.ui 04eb788b7631df34fa9fa2566d846540eb93c264 @@ -1,88 +1,77 @@ - + + DatabaseVariables - - + + 0 0 - 422 - 185 + 400 + 138 - + 400 0 - + Database variables - + - - - QFrame::StyledPanel + + + + + + 0 - - QFrame::Raised - - - - - - - - - 0 - - - - - + - - - Qt::ToolButtonTextOnly - - - - - - - false - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - update - - - Qt::ToolButtonTextOnly - - - - - - - + + + + + + + + Qt::ToolButtonTextOnly + + + + + + + false + + + - + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + update + + + Qt::ToolButtonTextOnly + + + + @@ -90,7 +79,7 @@ TreeView QTreeView -
TreeView.h
+
TreeView.h
 ============================================================ --- res/forms/icon_help.ui bb6e1aadff8a672675c787f35623da6fd76653b4 +++ res/forms/icon_help.ui 6093aff5d4e6b6a2c895a307b2792eaafaafaa5a @@ -1,388 +1,374 @@ - + + IconHelp - - + + 0 0 250 - 449 + 391 - - + + 0 0 - + 250 0 - + Form - + - - - true + + + QLayout::SetMinimumSize - - - - 0 - 0 - 222 - 421 - - - - - - - QLayout::SetMinimumSize - - - - - X - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Item is known and has no committable changes - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - X - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Item has changed contents - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - X - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Item has changed attributes - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - X - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Item has changed contents and attributes - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - X - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Item has been added - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - X - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Item has been dropped - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - X - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Item is part of a rename - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - X - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Item is ignored - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - X - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Item is unknown - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - X - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Item is missing - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - X - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - 0 - 0 - - - - Item is invalid (file type on disk is different from the recorded type) - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - - - - - - - Qt::Vertical - - - - 20 - 1 - - - - - - - + + + + X + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Item is known and has +no committable changes + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + false + + + + + + + X + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Item has changed contents + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + false + + + + + + + X + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Item has changed attributes + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + false + + + + + + + X + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Item has changed contents +and attributes + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + false + + + + + + + X + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Item has been added + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + false + + + + + + + X + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Item has been dropped + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + false + + + + + + + X + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Item is part of a rename + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + false + + + + + + + X + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Item is ignored + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + false + + + + + + + X + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Item is unknown + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + false + + + + + + + X + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Item is missing + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + false + + + + + + + X + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + 0 + 0 + + + + Item is invalid (file type on +disk is different from the +recorded type) + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + false + + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + ============================================================ --- res/forms/nodeinfo.ui e4c6043616ed5f5f0406523d128a4c43517bbb05 +++ res/forms/nodeinfo.ui 32e81bb113549633a5db7f31190fd98fd027e7e2 @@ -6,8 +6,8 @@ 0 0 - 337 - 444 + 250 + 420 @@ -26,9 +26,23 @@ Node information + + 0 + - + + + QToolBox::tab { + background: qlineargradient(x1:0,y1:0,x2:0,y2:1, stop: 0.1 palette(button),stop: 1 palette(mid)); + color: palette(text-button); + padding: 5px; +} + + + 1 + + 0 @@ -36,8 +50,8 @@ 0 0 - 313 - 315 + 250 + 345 @@ -114,11 +128,14 @@ - + 0 0 + + 50 + Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse @@ -139,12 +156,12 @@ 0 0 - 313 - 315 + 250 + 345 - Node Information + Record Information @@ -346,8 +363,8 @@ 0 0 - 313 - 315 + 250 + 345 @@ -497,6 +514,14 @@ + + + ToolBox + QToolBox +
ToolBox.h
+ 1 + +