Bugs with tooltip for the "Comment" rule element, debugging output visible and checkbox show icons in rules were fixed

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);
+    ok = contains(clipComment);
-    if (!ok) setShowCommentTip(false);
+    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);
 }

src/gui/FWBSettings.h

@@ -152,8 +152,8 @@ class FWBSettings : public QSettings {
     QFont getUiFont();
     void setUiFont(const QFont &font);
 
-    bool getShowCommentTip();
+    bool getClipComment();
-    void setShowCommentTip(bool);
+    void setClipComment(bool);
 private:
     QFont getFontByType(const char*type);
 };

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() );
     

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');
 

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);
 };
 

src/gui/fwbuilder_ru.ts

@@ -9227,7 +9227,7 @@ because of incompatible type.</source>
         <translation type="obsolete">1.2.9 или старше</translation>
     </message>
     <message>
-        <location filename="RCS.cpp" line="573"/>
+        <location filename="RCS.cpp" line="575"/>
         <source>Fatal error during initial RCS checkin of file %1 :
  %2
 Exit status %3</source>
@@ -9236,12 +9236,12 @@ Exit status %3</source>
 Код возврата %3</translation>
     </message>
     <message>
-        <location filename="RCS.cpp" line="966"/>
+        <location filename="RCS.cpp" line="968"/>
         <source>Fatal error running rlog for %1</source>
         <translation>Фатальная ошибка при выполнении rlog для %1</translation>
     </message>
     <message>
-        <location filename="RCS.cpp" line="1011"/>
+        <location filename="RCS.cpp" line="1013"/>
         <source>Fatal error running rcsdiff for file %1</source>
         <translation>Фатальная ошибка при выполнении rcsdiff для файла %1</translation>
     </message>
@@ -10250,34 +10250,34 @@ Builder GUI and save back to file again.</source>
 <context>
     <name>RCS</name>
     <message>
-        <location filename="RCS.cpp" line="824"/>
+        <location filename="RCS.cpp" line="826"/>
         <source>Error checking file out: %1</source>
         <translation>Ошибка при получении файла %1 из системы контроля версий</translation>
     </message>
     <message>
-        <location filename="RCS.cpp" line="825"/>
+        <location filename="RCS.cpp" line="827"/>
         <source>&amp;Continue</source>
         <translation>Продолжить</translation>
     </message>
     <message>
-        <location filename="RCS.cpp" line="703"/>
+        <location filename="RCS.cpp" line="705"/>
         <source>Error creating temporary file </source>
         <translation>Ошибка при создании временного файла</translation>
     </message>
     <message>
-        <location filename="RCS.cpp" line="716"/>
+        <location filename="RCS.cpp" line="718"/>
         <source>Error writing to temporary file </source>
         <translation>Ошибка при записи во временный файл</translation>
     </message>
     <message>
-        <location filename="RCS.cpp" line="749"/>
+        <location filename="RCS.cpp" line="751"/>
         <source>File is opened and locked by %1.
 You can only open it read-only.</source>
         <translation>Файл уже открыт и заблокирован %1.
 Вы можете открыть его только для чтения.</translation>
     </message>
     <message>
-        <location filename="RCS.cpp" line="763"/>
+        <location filename="RCS.cpp" line="765"/>
         <source>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.</source>
@@ -10286,17 +10286,17 @@ after the program crashed.</source>
 возможно остался открытым после краха предидущей копии программы.</translation>
     </message>
     <message>
-        <location filename="RCS.cpp" line="764"/>
+        <location filename="RCS.cpp" line="766"/>
         <source>Open &amp;read-only</source>
         <translation>Открыть только для чтения</translation>
     </message>
     <message>
-        <location filename="RCS.cpp" line="764"/>
+        <location filename="RCS.cpp" line="766"/>
         <source>&amp;Open and continue editing</source>
         <translation>Открыть и продолжить редактирование</translation>
     </message>
     <message>
-        <location filename="RCS.cpp" line="764"/>
+        <location filename="RCS.cpp" line="766"/>
         <source>&amp;Cancel</source>
         <translation>Отмена</translation>
     </message>
@@ -10968,52 +10968,52 @@ for this rule</source>
         <translation type="obsolete">Учёт</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="959"/>
+        <location filename="RuleSetView.cpp" line="958"/>
         <source>Outbound </source>
         <translation>Исходящее</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="1018"/>
+        <location filename="RuleSetView.cpp" line="1017"/>
         <source>Original</source>
         <translation>Исходный</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2135"/>
+        <location filename="RuleSetView.cpp" line="2134"/>
         <source>Insert Rule</source>
         <translation>Вставить правило</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="1883"/>
+        <location filename="RuleSetView.cpp" line="1882"/>
         <source>Paste Rule</source>
         <translation>Вставить правило из буфера обмена</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2187"/>
+        <location filename="RuleSetView.cpp" line="2186"/>
         <source>Edit</source>
         <translation>Редактировать</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2037"/>
+        <location filename="RuleSetView.cpp" line="2036"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2039"/>
+        <location filename="RuleSetView.cpp" line="2038"/>
         <source>Cut</source>
         <translation>Вырезать</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2040"/>
+        <location filename="RuleSetView.cpp" line="2039"/>
         <source>Paste</source>
         <translation>Вставить из буфера обмена</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2043"/>
+        <location filename="RuleSetView.cpp" line="2042"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2051"/>
+        <location filename="RuleSetView.cpp" line="2050"/>
         <source>Negate</source>
         <translation>Отрицание</translation>
     </message>
@@ -11033,67 +11033,67 @@ for this rule</source>
         <translation type="obsolete">Цветовая метка:</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2137"/>
+        <location filename="RuleSetView.cpp" line="2136"/>
         <source>Add Rule Below</source>
         <translation>Добавить правило ниже</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2140"/>
+        <location filename="RuleSetView.cpp" line="2139"/>
         <source>Remove Rule</source>
         <translation>Удалить правило</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2141"/>
+        <location filename="RuleSetView.cpp" line="2140"/>
         <source>Remove Rules</source>
         <translation>Удалить правила</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2144"/>
+        <location filename="RuleSetView.cpp" line="2143"/>
         <source>Move Rule</source>
         <translation>Переместить правило</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2145"/>
+        <location filename="RuleSetView.cpp" line="2144"/>
         <source>Move Rules</source>
         <translation>Переместить правила</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2151"/>
+        <location filename="RuleSetView.cpp" line="2150"/>
         <source>Copy Rule</source>
         <translation>Копировать правило</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2153"/>
+        <location filename="RuleSetView.cpp" line="2152"/>
         <source>Cut Rule</source>
         <translation>Вырезать правило</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2155"/>
+        <location filename="RuleSetView.cpp" line="2154"/>
         <source>Paste Rule Above</source>
         <translation>Вставить правило выше</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2157"/>
+        <location filename="RuleSetView.cpp" line="2156"/>
         <source>Paste Rule Below</source>
         <translation>Вставить правило ниже</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2164"/>
+        <location filename="RuleSetView.cpp" line="2163"/>
         <source>Enable Rule</source>
         <translation>Включить правило</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2165"/>
+        <location filename="RuleSetView.cpp" line="2164"/>
         <source>Enable Rules</source>
         <translation>Включить правила</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2169"/>
+        <location filename="RuleSetView.cpp" line="2168"/>
         <source>Disable Rule</source>
         <translation>Отключить правило</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2170"/>
+        <location filename="RuleSetView.cpp" line="2169"/>
         <source>Disable Rules</source>
         <translation>Отключить правила</translation>
     </message>
@@ -11103,7 +11103,7 @@ for this rule</source>
         <translation type="obsolete">Редактор комментариев</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="1031"/>
+        <location filename="RuleSetView.cpp" line="1030"/>
         <source>Any</source>
         <translation>Любой</translation>
     </message>
@@ -11128,112 +11128,112 @@ for this rule</source>
         <translation type="obsolete">Учитывать</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2004"/>
+        <location filename="RuleSetView.cpp" line="2003"/>
         <source>Inbound</source>
         <translation>Входящее</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2006"/>
+        <location filename="RuleSetView.cpp" line="2005"/>
         <source>Outbound</source>
         <translation>Исходящее</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2008"/>
+        <location filename="RuleSetView.cpp" line="2007"/>
         <source>Both</source>
         <translation>Оба</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2015"/>
+        <location filename="RuleSetView.cpp" line="2014"/>
         <source>Rule Options</source>
         <translation>Опции правила</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2021"/>
+        <location filename="RuleSetView.cpp" line="2020"/>
         <source>Logging On</source>
         <translation>Включить протоколирование</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2023"/>
+        <location filename="RuleSetView.cpp" line="2022"/>
         <source>Logging Off</source>
         <translation>Отключить протоколирование</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="1019"/>
+        <location filename="RuleSetView.cpp" line="1018"/>
         <source>Default</source>
         <translation>По-умолчанию</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="1022"/>
+        <location filename="RuleSetView.cpp" line="1021"/>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="1989"/>
+        <location filename="RuleSetView.cpp" line="1988"/>
         <source>Parameters</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2048"/>
+        <location filename="RuleSetView.cpp" line="2047"/>
         <source>Reveal in tree</source>
         <translation>Показывать в дереве</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2046"/>
+        <location filename="RuleSetView.cpp" line="2045"/>
         <source>Where used</source>
         <translation type="unfinished">Используется</translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2099"/>
+        <location filename="RuleSetView.cpp" line="2098"/>
         <source>Rules %1-%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2102"/>
+        <location filename="RuleSetView.cpp" line="2101"/>
         <source>Rule %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2104"/>
+        <location filename="RuleSetView.cpp" line="2103"/>
         <source>Change color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2108"/>
+        <location filename="RuleSetView.cpp" line="2107"/>
         <source>No color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2111"/>
+        <location filename="RuleSetView.cpp" line="2110"/>
         <source>Red</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2114"/>
+        <location filename="RuleSetView.cpp" line="2113"/>
         <source>Orange</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2117"/>
+        <location filename="RuleSetView.cpp" line="2116"/>
         <source>Yellow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2120"/>
+        <location filename="RuleSetView.cpp" line="2119"/>
         <source>Green</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2123"/>
+        <location filename="RuleSetView.cpp" line="2122"/>
         <source>Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2126"/>
+        <location filename="RuleSetView.cpp" line="2125"/>
         <source>Purple</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="RuleSetView.cpp" line="2129"/>
+        <location filename="RuleSetView.cpp" line="2128"/>
         <source>Gray</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17195,8 +17195,8 @@ First, create temporary access list to permit connections from the management su
     </message>
     <message>
         <location filename="prefsdialog_q.ui" line="460"/>
-        <source>Show comments in tooltips</source>
+        <source>Clip comments in rules</source>
-        <translation>Показывать комментарии во всплывающих подсказках</translation>
+        <translation>Обрезать в правилах комментарии по размеру ячейки</translation>
     </message>
     <message>
         <location filename="prefsdialog_q.ui" line="866"/>

src/gui/prefsdialog_q.ui

@@ -209,7 +209,7 @@
          </property>
         </spacer>
        </item>
-       <item row="5" column="7">
+       <item row="5" column="7" >
         <spacer>
          <property name="orientation" >
           <enum>Qt::Horizontal</enum>
@@ -455,9 +455,9 @@
         </widget>
        </item>
        <item row="7" column="1" colspan="6" >
-        <widget class="QCheckBox" name="chCommentTip" >
+        <widget class="QCheckBox" name="chClipComment" >
          <property name="text" >
-          <string>Show comments in tooltips</string>
+          <string>Clip comments in rules</string>
          </property>
         </widget>
        </item>
@@ -1265,6 +1265,54 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>chShowIcons</sender>
+   <signal>clicked()</signal>
+   <receiver>prefsDialog_q</receiver>
+   <slot>changeShowIcons()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>rb16</sender>
+   <signal>clicked()</signal>
+   <receiver>prefsDialog_q</receiver>
+   <slot>changeIconSize16()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>rb25</sender>
+   <signal>clicked()</signal>
+   <receiver>prefsDialog_q</receiver>
+   <slot>changeIconSize25()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
   <connection>
    <sender>btTreeFont</sender>
    <signal>clicked()</signal>