fix ui warning

kupiqu · Dec 29, 2019 · c038b4e · c038b4e
1 parent 0644181
commit c038b4e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 project(sierrabreezeenhanced)
-set(PROJECT_VERSION "0.8.9")
+set(PROJECT_VERSION "0.8.10")
 set(PROJECT_VERSION_MAJOR 0)
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+V0.8.10
+---------
+
+* fix ui warning
+
 V0.8.9
 ---------
 

diff --git a/config/breezeconfigwidget.cpp b/config/breezeconfigwidget.cpp
@@ -48,7 +48,7 @@ namespace Breeze
         // track ui changes
         connect( m_ui.titleAlignment, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
         connect( m_ui.buttonSize, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()) );
-        connect( m_ui.btnSpacingSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), [=](int /*i*/){updateChanged();} );
+        connect( m_ui.buttonSpacing, QOverload<int>::of(&QSpinBox::valueChanged), [=](int /*i*/){updateChanged();} );
         connect( m_ui.buttonPadding, SIGNAL(valueChanged(int)), SLOT(updateChanged()) );
         connect( m_ui.unisonHovering, SIGNAL(clicked()), SLOT(updateChanged()) );
         connect( m_ui.cornerRadiusSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), [=](int /*i*/){updateChanged();} );
@@ -92,7 +92,7 @@ namespace Breeze
         // assign to ui
         m_ui.titleAlignment->setCurrentIndex( m_internalSettings->titleAlignment() );
         m_ui.buttonSize->setCurrentIndex( m_internalSettings->buttonSize() );
-        m_ui.btnSpacingSpinBox->setValue( m_internalSettings->buttonSpacing() );
+        m_ui.buttonSpacing->setValue( m_internalSettings->buttonSpacing() );
         m_ui.buttonPadding->setValue( m_internalSettings->buttonPadding() );
         m_ui.unisonHovering->setChecked( m_internalSettings->unisonHovering() );
         m_ui.cornerRadiusSpinBox->setValue( m_internalSettings->cornerRadius() );
@@ -141,7 +141,7 @@ namespace Breeze
         // apply modifications from ui
         m_internalSettings->setTitleAlignment( m_ui.titleAlignment->currentIndex() );
         m_internalSettings->setButtonSize( m_ui.buttonSize->currentIndex() );
-        m_internalSettings->setButtonSpacing( m_ui.btnSpacingSpinBox->value() );
+        m_internalSettings->setButtonSpacing( m_ui.buttonSpacing->value() );
         m_internalSettings->setButtonPadding( m_ui.buttonPadding->value() );
         m_internalSettings->setUnisonHovering( m_ui.unisonHovering->isChecked() );
         m_internalSettings->setCornerRadius( m_ui.cornerRadiusSpinBox->value() );
@@ -204,7 +204,7 @@ namespace Breeze
         // assign to ui
         m_ui.titleAlignment->setCurrentIndex( m_internalSettings->titleAlignment() );
         m_ui.buttonSize->setCurrentIndex( m_internalSettings->buttonSize() );
-        m_ui.btnSpacingSpinBox->setValue( m_internalSettings->buttonSpacing() );
+        m_ui.buttonSpacing->setValue( m_internalSettings->buttonSpacing() );
         m_ui.buttonPadding->setValue( m_internalSettings->buttonPadding() );
         m_ui.unisonHovering->setChecked( m_internalSettings->unisonHovering() );
         m_ui.cornerRadiusSpinBox->setValue( m_internalSettings->cornerRadius() );
@@ -246,7 +246,7 @@ namespace Breeze
 
         if( m_ui.titleAlignment->currentIndex() != m_internalSettings->titleAlignment() ) modified = true;
         else if( m_ui.buttonSize->currentIndex() != m_internalSettings->buttonSize() ) modified = true;
-        else if( m_ui.btnSpacingSpinBox->value() != m_internalSettings->buttonSpacing() ) modified = true;
+        else if( m_ui.buttonSpacing->value() != m_internalSettings->buttonSpacing() ) modified = true;
         else if ( m_ui.buttonPadding->value() != m_internalSettings->buttonPadding() ) modified = true;
         else if( m_ui.unisonHovering->isChecked() != m_internalSettings->unisonHovering() ) modified = true;
         else if( m_ui.cornerRadiusSpinBox->value() != m_internalSettings->cornerRadius() ) modified = true;

diff --git a/config/ui/breezeconfigurationui.ui b/config/ui/breezeconfigurationui.ui
@@ -61,10 +61,13 @@
         </widget>
        </item>
        <item row="3" column="1">
-        <widget class="QLabel" name="btnSpacingLabel">
+        <widget class="QLabel" name="buttonSpacingLabel">
          <property name="text">
           <string>Button spacing:</string>
          </property>
+         <property name="buddy">
+           <cstring>buttonSpacing</cstring>
+         </property>
         </widget>
        </item>
        <item row="6" column="1">
@@ -132,7 +135,7 @@
         </widget>
        </item>
        <item row="3" column="2">
-        <widget class="QSpinBox" name="btnSpacingSpinBox">
+        <widget class="QSpinBox" name="buttonSpacing">
          <property name="suffix">
           <string> px</string>
          </property>
@@ -163,7 +166,7 @@
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
          <property name="buddy">
-          <cstring>buttonSpacing</cstring>
+          <cstring>buttonPadding</cstring>
          </property>
         </widget>
        </item>
@@ -751,7 +754,7 @@
   <tabstop>titleAlignment</tabstop>
   <tabstop>buttonSize</tabstop>
   <tabstop>buttonStyle</tabstop>
-  <tabstop>btnSpacingSpinBox</tabstop>
+  <tabstop>buttonSpacing</tabstop>
   <tabstop>buttonPadding</tabstop>
   <tabstop>hideTitleBar</tabstop>
   <tabstop>matchColorForTitleBar</tabstop>
-Original file line number
+Diff line change
@@ -1,3 +1,8 @@
+    V0.8.10
+    ---------
+    * fix ui warning
     V0.8.9
     ---------
@@ Expand Down @@