From f51f1784834759089be873a4a61d5b988c1629ce Mon Sep 17 00:00:00 2001 From: Date: Tue, 12 Feb 2008 08:02:28 +0000 Subject: [PATCH] Bugs with tooltip for the "Comment" rule element, debugging output visible and checkbox show icons in rules were fixed --- src/gui/FWBSettings.cpp | 14 ++--- src/gui/FWBSettings.h | 4 +- src/gui/PrefsDialog.cpp | 4 +- src/gui/RuleSetView.cpp | 11 ++-- src/gui/RuleSetView.h | 2 +- src/gui/fwbuilder_ru.qm | Bin 289515 -> 289514 bytes src/gui/fwbuilder_ru.ts | 120 +++++++++++++++++++-------------------- src/gui/prefsdialog_q.ui | 114 ++++++++++++++++++++++++++----------- 8 files changed, 158 insertions(+), 111 deletions(-) diff --git a/src/gui/FWBSettings.cpp b/src/gui/FWBSettings.cpp index 2b20c2dc9..46d5cdced 100644 --- a/src/gui/FWBSettings.cpp +++ b/src/gui/FWBSettings.cpp @@ -102,7 +102,7 @@ const char* rulesFont = SETTINGS_PATH_PREFIX "/UI/Fonts/RulesFont"; const char* treeFont = SETTINGS_PATH_PREFIX "/UI/Fonts/TreeFont"; const char* uiFont = SETTINGS_PATH_PREFIX "/UI/Fonts/UiFont"; -const char* showCommentTip = SETTINGS_PATH_PREFIX "/UI/ShowCommentTip"; +const char* clipComment = SETTINGS_PATH_PREFIX "/UI/ClipComment"; FWBSettings::FWBSettings() : QSettings(QSettings::UserScope, "netcitadel.com", "Firewall Builder") { @@ -198,8 +198,8 @@ void FWBSettings::init() ok = contains(uiFont); if (!ok) setUiFont(QFont("times", 11, QFont::Normal)); - ok = contains(showCommentTip); - if (!ok) setShowCommentTip(false); + ok = contains(clipComment); + if (!ok) setClipComment(true); #ifndef _WIN32 if (getSSHPath().isEmpty()) setSSHPath("ssh"); @@ -619,12 +619,12 @@ QFont FWBSettings::getFontByType(const char *type) return QFont("times", 11, QFont::Normal); } -bool FWBSettings::getShowCommentTip() +bool FWBSettings::getClipComment() { - return value(showCommentTip).toBool(); + return value(clipComment).toBool(); } -void FWBSettings::setShowCommentTip(bool showTooltip) +void FWBSettings::setClipComment(bool clip) { - setValue(showCommentTip, showTooltip); + setValue(clipComment, clip); } \ No newline at end of file diff --git a/src/gui/FWBSettings.h b/src/gui/FWBSettings.h index 2fb736973..5d3df62d8 100644 --- a/src/gui/FWBSettings.h +++ b/src/gui/FWBSettings.h @@ -152,8 +152,8 @@ class FWBSettings : public QSettings { QFont getUiFont(); void setUiFont(const QFont &font); - bool getShowCommentTip(); - void setShowCommentTip(bool); + bool getClipComment(); + void setClipComment(bool); private: QFont getFontByType(const char*type); }; diff --git a/src/gui/PrefsDialog.cpp b/src/gui/PrefsDialog.cpp index 71ce22d78..6f7efe77b 100644 --- a/src/gui/PrefsDialog.cpp +++ b/src/gui/PrefsDialog.cpp @@ -185,7 +185,7 @@ PrefsDialog::PrefsDialog(QWidget *parent) : QDialog(parent) rulesFont = st->getRulesFont(); treeFont = st->getTreeFont(); uiFont = st->getUiFont(); - m_dialog->chCommentTip->setChecked(st->getShowCommentTip() ); + m_dialog->chClipComment->setChecked(st->getClipComment() ); } void PrefsDialog::changeColor(QPushButton *btn, @@ -444,7 +444,7 @@ void PrefsDialog::accept() st->setTreeFont(treeFont); st->setUiFont(uiFont); - st->setShowCommentTip(m_dialog->chCommentTip->isChecked()); + st->setClipComment(m_dialog->chClipComment->isChecked()); st->setSSHPath( m_dialog->sshPath->text() ); diff --git a/src/gui/RuleSetView.cpp b/src/gui/RuleSetView.cpp index 8e7379783..8008998d0 100644 --- a/src/gui/RuleSetView.cpp +++ b/src/gui/RuleSetView.cpp @@ -475,9 +475,9 @@ RuleSetView::~RuleSetView() { } -bool RuleSetView::showComment(QPoint pos, QHelpEvent *he) +bool RuleSetView::showCommentTip(QPoint pos, QHelpEvent *he) { - if (!st->getShowCommentTip()) + if (!st->getClipComment()) return false; int col = columnAt(pos.x() - verticalHeader()->width()); if((pos.y() >= horizontalHeader()->height()) && RuleSetView::Comment == getColType(col)) @@ -515,7 +515,7 @@ bool RuleSetView::event ( QEvent * event ) { QHelpEvent *he = (QHelpEvent*) event; QPoint pos = he->pos(); - if (showComment(pos, he)) + if (showCommentTip(pos, he)) return true; if ((st->getObjTooltips()) && (pos.y() >= horizontalHeader()->height())) { @@ -531,7 +531,6 @@ bool RuleSetView::event ( QEvent * event ) contentsMouse.setY(contentsMouse.y() + verticalOffset() + 3);//+3 for fitting purposed cr=ruleDelegate->cellGeometry(row,col); - qDebug("%d", getColType(col)); if ( RuleSetView::Options == getColType(col) ) { @@ -974,7 +973,7 @@ QRect RuleSetView::calculateCellSize( int row, int col ) Qt::AlignLeft|Qt::AlignVCenter, QString::fromUtf8(rule->getComment().c_str()) ); - hc = item_h; // br.height() + RuleElementSpacing; // + hc = st->getClipComment() ? item_h : (br.height() + RuleElementSpacing/2); wc = RuleElementSpacing/2 + br.width(); break; } @@ -1333,7 +1332,7 @@ void RuleSetView::drawComment(QPainter &p, int row, int col, const QRect &cr) QRect br=p.boundingRect(QRect(x, y, 1000, 1000), Qt::AlignLeft|Qt::AlignVCenter, comm); - if (st->getShowCommentTip() && text_h > 0) + if (st->getClipComment() && text_h > 0) { QStringList strs = comm.split('\n'); diff --git a/src/gui/RuleSetView.h b/src/gui/RuleSetView.h index 2456b3097..d4dcdd272 100644 --- a/src/gui/RuleSetView.h +++ b/src/gui/RuleSetView.h @@ -429,7 +429,7 @@ private: QSize drawIconInRule(QPainter &p, int x, int y, libfwbuilder::RuleElement *re, libfwbuilder::FWObject *o1); QString chooseIcon(QString icn); - bool showComment(QPoint pos, QHelpEvent *he); + bool showCommentTip(QPoint pos, QHelpEvent *he); void drawComment(QPainter &p, int row, int col, const QRect &cr); }; diff --git a/src/gui/fwbuilder_ru.qm b/src/gui/fwbuilder_ru.qm index f18eddda302d8f37574f9e0fc1852096e8c8d573..f5fa68add83996bc70877ebf04cd41afcc70fe6f 100644 GIT binary patch delta 5159 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 delta 5168 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 diff --git a/src/gui/fwbuilder_ru.ts b/src/gui/fwbuilder_ru.ts index 7f91055df..11314781f 100644 --- a/src/gui/fwbuilder_ru.ts +++ b/src/gui/fwbuilder_ru.ts @@ -9227,7 +9227,7 @@ because of incompatible type. 1.2.9 или старше - + Fatal error during initial RCS checkin of file %1 : %2 Exit status %3 @@ -9236,12 +9236,12 @@ Exit status %3 Код возврата %3 - + Fatal error running rlog for %1 Фатальная ошибка при выполнении rlog для %1 - + Fatal error running rcsdiff for file %1 Фатальная ошибка при выполнении rcsdiff для файла %1 @@ -10250,34 +10250,34 @@ Builder GUI and save back to file again. RCS - + Error checking file out: %1 Ошибка при получении файла %1 из системы контроля версий - + &Continue Продолжить - + Error creating temporary file Ошибка при создании временного файла - + Error writing to temporary file Ошибка при записи во временный файл - + File is opened and locked by %1. You can only open it read-only. Файл уже открыт и заблокирован %1. Вы можете открыть его только для чтения. - + Revision %1 of this file has been checked out and locked by you earlier. The file may be opened in another copy of Firewall Builder or was left opened after the program crashed. @@ -10286,17 +10286,17 @@ after the program crashed. возможно остался открытым после краха предидущей копии программы. - + Open &read-only Открыть только для чтения - + &Open and continue editing Открыть и продолжить редактирование - + &Cancel Отмена @@ -10968,52 +10968,52 @@ for this rule Учёт - + Outbound Исходящее - + Original Исходный - + Insert Rule Вставить правило - + Paste Rule Вставить правило из буфера обмена - + Edit Редактировать - + Copy Копировать - + Cut Вырезать - + Paste Вставить из буфера обмена - + Delete Удалить - + Negate Отрицание @@ -11033,67 +11033,67 @@ for this rule Цветовая метка: - + Add Rule Below Добавить правило ниже - + Remove Rule Удалить правило - + Remove Rules Удалить правила - + Move Rule Переместить правило - + Move Rules Переместить правила - + Copy Rule Копировать правило - + Cut Rule Вырезать правило - + Paste Rule Above Вставить правило выше - + Paste Rule Below Вставить правило ниже - + Enable Rule Включить правило - + Enable Rules Включить правила - + Disable Rule Отключить правило - + Disable Rules Отключить правила @@ -11103,7 +11103,7 @@ for this rule Редактор комментариев - + Any Любой @@ -11128,112 +11128,112 @@ for this rule Учитывать - + Inbound Входящее - + Outbound Исходящее - + Both Оба - + Rule Options Опции правила - + Logging On Включить протоколирование - + Logging Off Отключить протоколирование - + Default По-умолчанию - + All Все - + Parameters Параметры - + Reveal in tree Показывать в дереве - + Where used Используется - + Rules %1-%2 - + Rule %1 - + Change color - + No color - + Red - + Orange - + Yellow - + Green - + Blue - + Purple - + Gray @@ -17195,8 +17195,8 @@ First, create temporary access list to permit connections from the management su - Show comments in tooltips - Показывать комментарии во всплывающих подсказках + Clip comments in rules + Обрезать в правилах комментарии по размеру ячейки diff --git a/src/gui/prefsdialog_q.ui b/src/gui/prefsdialog_q.ui index ce1d826ef..113702099 100644 --- a/src/gui/prefsdialog_q.ui +++ b/src/gui/prefsdialog_q.ui @@ -209,7 +209,7 @@ - + Qt::Horizontal @@ -455,9 +455,9 @@ - + - Show comments in tooltips + Clip comments in rules @@ -1248,53 +1248,101 @@ 20 - - + + btRulesFont clicked() prefsDialog_q changeRulesFont() - - 20 - 20 - - - 20 - 20 - + + 20 + 20 + + + 20 + 20 + - - + + + chShowIcons + clicked() + prefsDialog_q + changeShowIcons() + + + 20 + 20 + + + 20 + 20 + + + + + rb16 + clicked() + prefsDialog_q + changeIconSize16() + + + 20 + 20 + + + 20 + 20 + + + + + rb25 + clicked() + prefsDialog_q + changeIconSize25() + + + 20 + 20 + + + 20 + 20 + + + + btTreeFont clicked() prefsDialog_q changeTreeFont() - - 20 - 20 - - - 20 - 20 - + + 20 + 20 + + + 20 + 20 + - - + + btUiFont clicked() prefsDialog_q changeUiFont() - - 20 - 20 - - - 20 - 20 - + + 20 + 20 + + + 20 + 20 +